-
Notifications
You must be signed in to change notification settings - Fork 52
Reducing example apps from static code #315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
mdroll
wants to merge
25
commits into
main
Choose a base branch
from
feature/extract-example-apps
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Move example-app definitions from `argocd/example-apps` and `applications/` into `examples/example-apps-via-content-loader` - Adjust Dockerfile to initialize example-apps folder as standalone git repo for content-loader - Update `GitopsPlaygroundCli` to include content examples via `--content.examples` flag - Extend config merging logic (`MapUtils.deepMerge`) to support additional example content source - Update schema, configurator, and tests to handle example-apps path and validation - Clean up redundant templates and adjust paths accordingly This refactor isolates example application definitions into a dedicated content-loader directory, simplifying configuration handling and enabling dynamic content loading via the CLI.
- extract hardcoded references for example-apps in unit test
…back to main for test evaluation
…edentials verification parts
- Remove not used constants - Add references for e.g., two registries operation inside the content-loader doc
871a4ff to
3b99a12
Compare
…le-apps # Conflicts: # docs/configuration.schema.json # examples/example-apps-via-content-loader/argocd/argocd/applications/example-apps.ftl.yaml # examples/example-apps-via-content-loader/argocd/argocd/projects/example-apps.ftl.yaml # examples/example-apps-via-content-loader/argocd/example-apps/argocd/nginx-helm-jenkins.ftl.yaml # examples/example-apps-via-content-loader/argocd/example-apps/argocd/nginx-helm-umbrella.ftl.yaml # examples/example-apps-via-content-loader/argocd/example-apps/argocd/petclinic-helm.ftl.yaml # examples/example-apps-via-content-loader/argocd/example-apps/argocd/petclinic-plain.ftl.yaml # examples/example-apps-via-content-loader/argocd/petclinic-helm/k8s/values-shared.ftl.yaml # scripts/scm-manager/init-scmm.sh # src/main/groovy/com/cloudogu/gitops/config/ApplicationConfigurator.groovy # src/main/groovy/com/cloudogu/gitops/features/ScmManager.groovy # src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy # src/test/groovy/com/cloudogu/gitops/ApplicationConfiguratorTest.groovy # src/test/groovy/com/cloudogu/gitops/features/JenkinsTest.groovy # src/test/groovy/com/cloudogu/gitops/features/ScmManagerSetupTest.groovy # src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy
…to feature/extract-example-apps
nihussmann
reviewed
Nov 18, 2025
examples/example-apps-via-content-loader/argocd/example-apps/argocd/nginx-helm-jenkins.ftl.yaml
Outdated
Show resolved
Hide resolved
nihussmann
reviewed
Nov 18, 2025
examples/example-apps-via-content-loader/argocd/example-apps/argocd/petclinic-helm.ftl.yaml
Outdated
Show resolved
Hide resolved
nihussmann
reviewed
Nov 18, 2025
examples/example-apps-via-content-loader/argocd/example-apps/argocd/petclinic-plain.ftl.yaml
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hard-coded references to example apps should now be completely removed. As mentioned in ticket RM-55298, the exercises directory has also been removed.
To test with two registries (or in air-gapped environment), you need to provide your own config.yaml for the example app sand modify the image references in this file. These image references are then passed to the GitOps build library.
As for now removing the exercices from the gop leads to a 1% decrease of test coverage.